Improve sorting and displaying algorithms for top-clients and top-domains #196
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…how many lines of data we have sent, we can also explicitly count them. Signed-off-by: DL6ER <dl6er@dl6er.de>
… also adds the optional "desc" feature to the top clients requests where it wasn't available before Signed-off-by: DL6ER <dl6er@dl6er.de>
DL6ER
commented
Jan 8, 2018
| continue; | ||
| } | ||
| } | ||
| if(excludedomains != NULL && insetupVarsArray(domains[j].domain)) |
There was a problem hiding this comment.
Using short-circuit evaluation here, no functional change.
DL6ER
commented
Jan 8, 2018
| continue; | ||
| } | ||
| } | ||
| if(excludeclients != NULL && (insetupVarsArray(clients[j].ip) || insetupVarsArray(clients[j].name))) |
There was a problem hiding this comment.
Using short-circuit evaluation here, no functional change.
DL6ER
commented
Jan 8, 2018
request.c
Outdated
| // Sort temporary array | ||
| qsort(temparray, counters.clients, sizeof(int[2]), cmpasc); |
There was a problem hiding this comment.
Added optional desc sorting here, this is basically a copy of the code in lines 369-372.
|
|
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
Okay, again ready for review. Clarified the roles of ascending and descending and added three additional test that should ensure that we don't mix it up, again. |
AzureMarker
approved these changes
Jan 11, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By submitting this pull request, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your PR:
Please submit all pull requests against the
developmentbranch. Failure to do so will delay or deny your requestHow familiar are you with the codebase?:
10
getTopDomains(). Instead of assuming how many lines of data we have sent, we can also explicitly count them.getTopClients(). As a by-product this also adds the optionaldescfeature to the top clients requests where it wasn't available before.Note that I completely removed the
skipvariable as it is not important how many lines we have already skipped when now directly count the number of returned datasets.The new code has been tested against two possible failures:
Both tests returned the expected results.
This template was created based on the work of
udemy-dl.